From: awilliam@xenbuild.aw Date: Tue, 6 Jun 2006 15:06:19 +0000 (-0600) Subject: [IA64] remove xenia64_init.c X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15992 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=478e357a665b4f83049904fde372080cedd51f2a;p=xen.git [IA64] remove xenia64_init.c Relocate the few bits left to ia64 specific parts of the tree. Signed-off-by: Alex Williamson --- diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c index 0cd53ed8db..171d29b403 100644 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c @@ -519,14 +519,18 @@ setup_arch (char **cmdline_p) } #ifdef CONFIG_XEN if (is_running_on_xen()) { - extern shared_info_t *HYPERVISOR_shared_info; - extern int xen_init (void); + shared_info_t *s = HYPERVISOR_shared_info; - xen_init (); + xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT); + xen_start_info->flags = s->arch.flags; + + printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld " + "flags=0x%x\n", s->arch.start_info_pfn, + xen_start_info->nr_pages, xen_start_info->flags); /* xen_start_info isn't setup yet, get the flags manually */ - if (HYPERVISOR_shared_info->arch.flags & SIF_INITDOMAIN) { - if (!(HYPERVISOR_shared_info->arch.flags & SIF_PRIVILEGED)) + if (s->arch.flags & SIF_INITDOMAIN) { + if (!(s->arch.flags & SIF_PRIVILEGED)) panic("Xen granted us console access " "but not privileged status"); } else { diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre index a7b9302ab8..a6d80acbbf 100755 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre @@ -16,9 +16,6 @@ ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/ ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile -#not sure where these ia64-specific files will end up in the future -ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core - #still a few x86-ism's in various drivers/xen files, patch them #cd drivers/xen #if [ ! -e ia64.patch.semaphore ] diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile index f396542b44..7f89b8ea69 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile @@ -7,7 +7,6 @@ obj-$(CONFIG_PROC_FS) += xen_proc.o ifeq ($(ARCH),ia64) obj-y += evtchn.o -obj-y += xenia64_init.o ifeq ($(CONFIG_XEN_IA64_DOM0_VP),y) obj-$(CONFIG_NET) += skbuff.o endif diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c deleted file mode 100644 index 4833a4f928..0000000000 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c +++ /dev/null @@ -1,60 +0,0 @@ -#ifdef __ia64__ -#include -#include -#include -#include -#include -/* #include */ -#include -#include - -shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE; -EXPORT_SYMBOL(HYPERVISOR_shared_info); - -start_info_t *xen_start_info; - -int running_on_xen; -EXPORT_SYMBOL(running_on_xen); - -int xen_init(void) -{ - static int initialized; - shared_info_t *s = HYPERVISOR_shared_info; - - if (initialized) - return running_on_xen ? 0 : -1; - - if (!is_running_on_xen()) - return -1; - - xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT); - xen_start_info->flags = s->arch.flags; - printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld flags=0x%x\n", - s->arch.start_info_pfn, xen_start_info->nr_pages, - xen_start_info->flags); - - initialized = 1; - return 0; -} - -#ifndef CONFIG_XEN_IA64_DOM0_VP -/* We just need a range of legal va here, though finally identity - * mapped one is instead used for gnttab mapping. - */ -unsigned long alloc_empty_foreign_map_page_range(unsigned long pages) -{ - struct vm_struct *vma; - - if ( (vma = get_vm_area(PAGE_SIZE * pages, VM_ALLOC)) == NULL ) - return NULL; - - return (unsigned long)vma->addr; -} -#endif - -#if 0 -/* These should be define'd but some drivers use them without - * a convenient arch include */ -unsigned long mfn_to_pfn(unsigned long mfn) { return mfn; } -#endif -#endif diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c index 7fe01feb80..58e30466a3 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c @@ -23,6 +23,7 @@ //#include #include #include +#include #include #include #include @@ -30,6 +31,14 @@ #include #include +shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE; +EXPORT_SYMBOL(HYPERVISOR_shared_info); + +start_info_t *xen_start_info; + +int running_on_xen; +EXPORT_SYMBOL(running_on_xen); + //XXX xen/ia64 copy_from_guest() is broken. // This is a temporal work around until it is fixed. // used by balloon.c netfront.c diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/util.c b/linux-2.6-xen-sparse/arch/ia64/xen/util.c index 5bc074a9ad..f305e89989 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/util.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/util.c @@ -104,6 +104,21 @@ void unlock_vm_area(struct vm_struct *area) } EXPORT_SYMBOL_GPL(unlock_vm_area); +#ifndef CONFIG_XEN_IA64_DOM0_VP +/* We just need a range of legal va here, though finally identity + * mapped one is instead used for gnttab mapping. + */ +unsigned long alloc_empty_foreign_map_page_range(unsigned long pages) +{ + struct vm_struct *vma; + + if ( (vma = get_vm_area(PAGE_SIZE * pages, VM_ALLOC)) == NULL ) + return NULL; + + return (unsigned long)vma->addr; +} +#endif + /* * Local variables: * c-file-style: "linux"